bitkeeper revision 1.1236.1.87 (423c8189hXTe3A8DrAyRsqryeVoNxQ)

Add MMC and Infoniband devices to XenLinux driver configuration
options.
Signed-off-by: Keir Fraser <keir@xensource.com>

diff --git a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers
index 93db5f9df6dcf834de01f6400f6f9466a45892d2..8158f26fd0dd9b60716ff6e56261d0cc743648ea 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers
+++ b/linux-2.6.11-xen-sparse/arch/xen/Kconfig.drivers
@@ -44,6 +44,8 @@ source "drivers/media/Kconfig"
 source "drivers/video/Kconfig"
 source "sound/Kconfig"
 source "drivers/usb/Kconfig"
+source "drivers/mmc/Kconfig"
+source "drivers/infiniband/Kconfig"
 endif
 
 if !XEN_PHYSDEV_ACCESS

diff --git a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
index 2d1a431dcd1c14d8759495ddcafaeb17c91291ba..e906f9852142bd6dad0b27459bb266b6c7bd3ed7 100644 (file)
--- a/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
+++ b/linux-2.6.11-xen-sparse/arch/xen/configs/xen0_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.11-xen0
-# Sat Mar 12 21:28:56 2005
+# Sat Mar 19 19:42:39 2005
 #
 CONFIG_XEN=y
 CONFIG_ARCH_XEN=y
@@ -816,7 +816,7 @@ CONFIG_AGP_SIS=m
 CONFIG_AGP_SWORKS=m
 CONFIG_AGP_VIA=m
 # CONFIG_AGP_EFFICEON is not set
-CONFIG_DRM=y
+CONFIG_DRM=m
 CONFIG_DRM_TDFX=m
 # CONFIG_DRM_GAMMA is not set
 CONFIG_DRM_R128=m
@@ -889,6 +889,16 @@ CONFIG_USB_ARCH_HAS_OHCI=y
 #
 # CONFIG_USB_GADGET is not set
 
+#
+# MMC/SD Card support
+#
+# CONFIG_MMC is not set
+
+#
+# InfiniBand support
+#
+# CONFIG_INFINIBAND is not set
+
 #
 # File systems
 #